Don't put relevant callss in g_assert(). (#329876, Kristian Rietveld)

2006-02-08  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkfilechooserbutton.c: Don't put relevant callss
	in g_assert().  (#329876, Kristian Rietveld)

diff --git a/ChangeLog b/ChangeLog
index b2a7c437c694f94065adfbd1e33f41d58824889b..f2570cfa3506e3412e49a6bf30d678793e8a5595 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-08  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfilechooserbutton.c: Don't put relevant callss
+       in g_assert().  (#329876, Kristian Rietveld)
+
 2006-02-08  Tor Lillqvist  <tml@novell.com>
 
        * gdk/win32/gdkevents-win32.c (gdk_pointer_grab)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b2a7c437c694f94065adfbd1e33f41d58824889b..f2570cfa3506e3412e49a6bf30d678793e8a5595 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-02-08  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfilechooserbutton.c: Don't put relevant callss
+       in g_assert().  (#329876, Kristian Rietveld)
+
 2006-02-08  Tor Lillqvist  <tml@novell.com>
 
        * gdk/win32/gdkevents-win32.c (gdk_pointer_grab)

diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index 7219734ccea93e4ebd256c02c80dd64c2a5d47df..4a5180c94242931af05b81c510e9d05aea687ef8 100644 (file)
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -568,7 +568,7 @@ gtk_file_chooser_button_remove_shortcut_folder (GtkFileChooser     *chooser,
       gchar type;
 
       pos = model_get_type_position (button, ROW_TYPE_SHORTCUT);
-      g_assert (gtk_tree_model_iter_nth_child (priv->model, &iter, NULL, pos));
+      gtk_tree_model_iter_nth_child (priv->model, &iter, NULL, pos);
 
       do
        {
@@ -863,7 +863,7 @@ gtk_file_chooser_button_finalize (GObject *object)
   if (priv->old_path)
     gtk_file_path_free (priv->old_path);
 
-  g_assert (gtk_tree_model_get_iter_first (priv->model, &iter));
+  gtk_tree_model_get_iter_first (priv->model, &iter);
 
   do
     {
@@ -1105,7 +1105,7 @@ change_icon_theme (GtkFileChooserButton *button)
 
   update_label_and_image (button);
 
-  g_assert (gtk_tree_model_get_iter_first (priv->model, &iter));
+  gtk_tree_model_get_iter_first (priv->model, &iter);
 
   theme = get_icon_theme (GTK_WIDGET (button));
 
@@ -1746,7 +1746,7 @@ update_combo_box (GtkFileChooserButton *button)
   GtkTreeIter iter;
   gboolean row_found;
 
-  g_assert (gtk_tree_model_get_iter_first (priv->filter_model, &iter));
+  gtk_tree_model_get_iter_first (priv->filter_model, &iter);
 
   paths = _gtk_file_chooser_get_paths (GTK_FILE_CHOOSER (priv->dialog));
 
@@ -1812,7 +1812,7 @@ update_combo_box (GtkFileChooserButton *button)
       gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (priv->filter_model));
 
       pos = model_get_type_position (button, ROW_TYPE_CURRENT_FOLDER);
-      g_assert (gtk_tree_model_iter_nth_child (priv->model, &iter, NULL, pos));
+      gtk_tree_model_iter_nth_child (priv->model, &iter, NULL, pos);
 
       gtk_tree_model_filter_convert_child_iter_to_iter (GTK_TREE_MODEL_FILTER (priv->filter_model),
                                                        &filter_iter, &iter);
@@ -2158,7 +2158,7 @@ dialog_notify_cb (GObject    *dialog,
 
          pos = model_get_type_position (user_data,
                                         ROW_TYPE_CURRENT_FOLDER);
-         g_assert (gtk_tree_model_iter_nth_child (priv->model, &iter, NULL, pos));
+         gtk_tree_model_iter_nth_child (priv->model, &iter, NULL, pos);
 
          data = NULL;
          gtk_tree_model_get (priv->model, &iter, DATA_COLUMN, &data, -1);